Fix incorrect args to display-buffer-reuse-window in revno 105058.

* lisp/window.el (display-buffer): Fix arguments to
display-buffer-reuse-window in last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 77506c74c9b6fe1cce23068d8805e94bff8efa85..cea690723df190d70db14409ed6ae7e8133b42c0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-10  Chong Yidong  <cyd@stupidchicken.com>
+
+       * window.el (display-buffer): Fix arguments to
+       display-buffer-reuse-window in last change.
+
 2011-07-09  Bob Nnamtrop  <bobnnamtrop@gmail.com>  (tiny change)
 
        * emulation/viper-cmd.el (viper-change-state-to-vi): Limit

diff --git a/lisp/window.el b/lisp/window.el
index 3bc4b3e56e649cd088e891b67169bda4182f33d7..999e408bdb112a800ae58404a84b66f85151f949 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5737,19 +5737,19 @@ this list as arguments."
       (or (and (window-live-p window) window)
          ;; on the selected frame,
          (display-buffer-reuse-window
-          buffer '(nil nil nil) other-window)
+          buffer '(nil nil nil) nil other-window)
          ;; showing BUFFER on any visible frame,
          (display-buffer-reuse-window
-          buffer '(nil same visible) other-window)
+          buffer '(nil same visible) nil other-window)
          ;; not showing BUFFER on any visible frame,
          (display-buffer-reuse-window
-          buffer '(nil other visible) other-window)
+          buffer '(nil other visible) nil other-window)
          ;; showing BUFFER on any visible or iconified frame,
          (display-buffer-reuse-window
-          buffer '(nil same 0) other-window)
+          buffer '(nil same 0) nil other-window)
          ;; not showing BUFFER on any visible or iconified frame.
          (display-buffer-reuse-window
-          buffer '(nil other 0) other-window)
+          buffer '(nil other 0) nil other-window)
          ;; If everything failed so far, try popping up a new frame
          ;; regardless of graphic-only restrictions.
          (display-buffer-pop-up-frame buffer)))))